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

Change-Id: I68e83d4db8fe1e1f7196e96a82bc19200bc1af90