Merge "Custom settings ui with dialogs." into gb-ub-photos-denali