Councillors agree to prioritise tram to Royal Infirmary but keep Granton on table