Merge "Remove background for button bar for watch devices." into cw-f-dev