Merge "Use a round rect background drawable for "clear all"" into nyc-mr1-dev