Merge "Revert "Reset any non-runtime permissions with user sensitive"" into rvc-dev