Merge "Adding customizable background color support for watch." into cw-f-dev am: 881011d951
am: c744ba2426

Change-Id: I02355e93e8130f139064db00672b86e3fa2e67c0