Merge "Revert "Show location permission group, even when fixed."" into mnc-dev