Merge "Fix the blank PiP window when unlock" into tm-dev