Merge "Resume-on-Reboot: normalize screen state" into rvc-dev