Merge \"Fix updateShortcuts() with icons\" into nyc-mr1-dev
am: bc8e0052fd

Change-Id: I009387abcbb24e3051611eee708fedd86f1b9dcd