am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad

* commit '87d093d6145524b1c8f5c052dfe40c18b52e5235':
  Bring full screen window flag back to camera