Merge "Keep the permissions dialog width consistent" into mnc-dev