Merge "Fixes clear all button disappearing after rotate on low ram device" into oc-mr1-dev am: 0424bb7dad
am: 346388d719

Change-Id: I3eea093e06f3434973f936c26656f6e6d683bc12