Merge "Fix up bar transitions on low end devices" into oc-mr1-dev am: e087252671
am: ecb3e7a440

Change-Id: I104a1479bbf8d35de6ba1e8f311b184783edee1a