Merge "DO NOT MERGE Early return for getPresentFenceShift" into main