Merge "Allow someone to prevent reboot during device recovery"