Merge "Handle clear all button show and hide functionality for low ram devices" into oc-mr1-dev
am: 88c6071b5d

Change-Id: Ie6e19de115ef8647a6d5b8d6b81efc3743778bc5