Merge "Properly constrain FAB to its normal bounds when tucking" into main