Merge "Remove background for button bar for watch devices." into cw-f-dev am: b4b51ec3c1
am: e590d27098

Change-Id: Ia3b8ad6cb1217f023cd850172beb67cce0089351