am 65c8cb82: am b53a8c2a: am 11cb403d: Merge "Add null checks for quickly disappearing Displays" into lmp-dev

* commit '65c8cb820336b16c4da04b8b492c6705445ca30a':
  Add null checks for quickly disappearing Displays