Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81 am: 94e892a3" into oc-mr1-dev-plus-aosp