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

Change-Id: I6c6a98b7f207406a21e41ef4768e45bb190270aa