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