Merge "Ensure we correctly unblank displays when added." into lmp-dev