Merge "Fix updateShortcuts() with icons" into nyc-mr1-dev