Merge "Disable managed profile version of shortcut picker." into oc-dev