Merge "Revert^2 "Be prepared for 8k video frames in bitmaps"" into main