Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81da am: 00089101fd" into oc-mr1-dev-plus-aosp
am: 52e3c6fa15

Change-Id: I94bdd6e3c3a41f69070b9f83d277312d5aa249d5