Merge "Update per-profile user restrictions" into rvc-dev