Merge "Reflect the proper permission group state in the UI" into mnc-dev