Fix flicker at the end of content PiP animation

The work around we use seems to cause the flicker at the end of
entering content PiP animation and the underlying issue for that work
around is not found with the latest build.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hrZU8ebsxP3mEqdaF6BfwL
Bug: 242601499
Test: repeatedly enter content PiP, see video
Change-Id: I6d9d78e6cca519ed8251221a7ceab829cb22aae1