Merge "Properly constrain FAB to its normal bounds when tucking" into 24D1-dev