Merge "Resume-on-Reboot: Citadel implementation" into rvc-dev