Merge "Add null check to updateHasAboveClientLocked" into main