Merge "Revert "Make sure Bitmap for PiP overlay being recycled"" into main