Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev
am: c63c9f8ae1

Change-Id: Ib006982c87cc4378c697e213504adc05cf2c0658