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

* commit '930b9b41185a2f59c05fe527300248776d3993a0':
  Leave ROI not set except in tap-to-focus scenario