Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev