Merge "Change session API to support location inside a task." into gb-ub-photos-denali