Merge "Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev am: 0877b99aaf am: c9e95c66f4"