Merge "Remove UI param for straighten." into gb-ub-photos-bryce