Merge "Add null checks for quickly disappearing Displays" into lmp-dev