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

Change-Id: I771ab6487432bce908a2d511249eacf2ea5b2002