Merge "Grant MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission to Shell" into rvc-dev