Merge "Define flicker test for drag-to-maximize" into main