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: Iae00d0288786bb92c0d5fe453f6916f76f793e91