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

Change-Id: I43afd141d4268629804df203d61d9b16ff24bb9a