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

Change-Id: If469bf3f35e7cb9816f56ab90c966e7114c0a731