Merge "Ensure per package and per UID state share same package settings." into mnc-dev