FIX - FLEX-33865 ConstraintLayout optimization