Merge "Fix visibility change during entering PIP app transition" into tm-dev