am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad

* commit '8c80782326d1cdc764b9a9a791b2c5525e8ef234':
  Remove display change listener for mode switch