Merge "Fixes clear all button disappearing after rotate on low ram device" into oc-mr1-dev