Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."