Merge "Fixes rounded corners for clear all button on low ram devices" into oc-mr1-dev
am: 440240db5c

Change-Id: I5bfd0a633e96447c37f7b64c4fc8fc52b374f059