* commit '3509e3731649a99b426b97363f06c7288e5d33e2': Migrate more System and Secure settings to Global.