Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad