am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad

* commit 'fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc':
  Fix black screen in mode switching