Merge "Remove personal/device group & skip perm screen for M+ apps." into mnc-dev