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

Change-Id: Icdfd18fb09263267daef0d0c6e8ea7d6fad5dec1