Merge "Add NeverDecreaseWidth modifier" into main