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

Change-Id: I06a025ab25429dbcf14cd14a4771b6a423794dfe