Merge "Prevent sessions from resuming once boot is completed" into rvc-dev