Merge "Change secure setting that controls skipping of user-facing packages" into rvc-dev