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: c4c292b3
Change-Id: I9fd8d9328361d5d2273d2e1a69f5ee87d74e7327