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: 3eafed8c am: 97e16084 am: 6ef8f340
Change-Id: Iea5c4169db92ac3f1892dd9d0e42ac6162f5f8a7