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