Merge "WindowStateAnimator: Hide preserved surface when showing new Surface" into pi-dev