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

Change-Id: Ia90d8c148df3055794f83cde5ef0a1f7501bdfe9