Merge "Add keys to all Preferences on the Managed device info page" into oc-dev