Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: adfc1ad840" into oc-dr1-dev-plus-aosp