Merge "Check RescueParty before using SysUI reboot message" into tm-dev