Merge "Ensure consistent stack behind PIP when going to/from fullscreen."