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