Merge "FP2-1575: do not dequeue from native window after we hit fat" into fp2-dev-v2