Merge "Fix the flicker when entering PiP from Recents" into tm-qpr-dev