Merge "Respect forceNonSystemPackage param when creating new Setting objects."