Merge "Resume-on-Reboot: remove special string" into rvc-dev