Merge "Use proper package name and UID when checking write settings access" into nyc-dev