Merge "Add optional metadata to specify icon's background color." into pi-dev am: 72634cae72
am: 7ecc1ff2b4

Change-Id: Ib10b160be813bf57404a66be167c4534d19aa4a8