Merge "Add quick settings permission to system ui"