Merge "Move the non-market install setting from Global to per-user Secure"