Merge "Generating missing permission state inside restorePermissionState()." into rvc-dev