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

Change-Id: I1a69983fa66a71651be388c5f986136e41f63615