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

* commit '11cb403dd066e4de527e3c6079b3def6d3bc82bd':
  Add null checks for quickly disappearing Displays