Merge "Revert "Enable Pinning Deep Shortcuts in Secondary Display""