Merge "Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts"...
Merge "Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts" into rvc-dev am: a3c47e79 am: ec3533b2 am: b2294372
Change-Id: Ie9305b1dea603730ab658d5cab16bf2307ef0785