Merge "Prevent changing mFromState during insets resize animation" into main