Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev
am: afe3eb81da

Change-Id: I94ef9796fe00b3e1ce1312e1f038b1d73456310d