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 am: 801a1ee0
Change-Id: I81d2b56167da5adad093766fff3c702ae70735a1