Merge "[Settings] Change the ordering of permission"