Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali