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

* commit 'b53a8c2a713c10f9948b0353dd53cb67a6b4fe56':
  Add null checks for quickly disappearing Displays