Merge "Fix split snapshot broken after rotating in fake orientation" into main