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
Change-Id: Ibfd7ea330d6b94ca21832371cacbea7677a4e979