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