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

Change-Id: I5c66f38c731585cf7c3b05b6f5c64d5286931757