am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad

* commit '1b44336b29d2145eaaf0786be47c08e2b5304bcf':
  Let the Camera app remember which mode it was started in last.