Merge "Fix package-enabled check in Developer Settings." into nyc-dev