Merge "Make system gallery role fall back to its default." into rvc-dev
tree: f4378a7d9f8d9f325bca2e11d225cc86b46149c0
  1. PermissionController/