Merge "Only send KEYGUARD_APPEARING if display is on" into main