Merge "Refactor/Clean up on PiP dismiss code."