Problem with states not working as before without code change (only SDK)

I have a confirmed bug in a module of a CMS I worked on in the past 2-3
years. The only change now is that I use Apache Flex 4.10.

I use includeIn for showing buttons in states. Since the migration from Flex
4.1 or 4.6 to 4.10 it is not working anymore. So I am not entirely sure if
the change in SDK happened between 4.1 and 4.6 or between 4.6 and 4.10.

The MXML shows different buttons being shown in different states. When I go
from "normal" to "editMode" and then back to "normal" the default buttons do
not show anymore. Anyone can help me?

<controls:EnalityButton id="batchOption"
enabled="{Boolean(photoCollection.length > 0)}" includeIn="normal"
label="{LanguageManager.getManager().getText(LanguageManager.getManager().texts,
'Select multiple..')}" bottom="{adjustBottomPaddingIfNeeded(45)}" left="30"
click="batchOption_clickHandler(event)" />

<controls:EnalityButton id="sortOption" visible="{(this.uploadType ==
'product')}" enabled="{Boolean(photoCollection.length > 0)}"
includeIn="normal" label="Sorteer per merk"
bottom="{adjustBottomPaddingIfNeeded(45)}" left="230"
click="sortOption_clickHandler(event)" />

<s:HGroup includeIn="batchMode" bottom="{adjustBottomPaddingIfNeeded(45)}"
left="30">
<controls:EnalityButton id="btnCancelBatchMode"
label="{LanguageManager.getManager().getText(LanguageManager.getManager().texts,
'Cancel')}" click="btnCancelBatchMode_clickHandler(event)" />
<controls:EnalityButton id="btnDeleteSelectedPhotos"
label="{LanguageManager.getManager().getText(LanguageManager.getManager().texts,
'Delete') + ' (0)'}" enabled="false"
styleName="enalityDeleteButton"
click="btnDeleteSelectedPhotos_clickHandler(event)" />
<controls:EnalityButton id="btnRevokeSelection" visible="false"
label="{LanguageManager.getManager().getText(LanguageManager.getManager().texts,
'Unselect all')}" click="btnRevokeSelection_clickHandler(event)" />
<controls:EnalityButton id="btnEditAll" visible="false"
label="{LanguageManager.getManager().getText(LanguageManager.getManager().texts,
'Edit') + ' (0)'}" click="btnEditAll_clickHandler(event)" />
</s:HGroup>

<s:HGroup includeIn="batchMode,normal"
bottom="{adjustBottomPaddingIfNeeded(43)}"
right="{adjustRightPaddingIfNeeded(45)}">
<mx:Image id="zoomOutButton" source="{CMSData.rootURL +
'assets/images/zoomout.png'}" buttonMode="{zoomOutButton.enabled}"
mouseDown="zoomOutButton_mouseDownHandler(event)"
mouseUp="zoomOutButton_mouseUpHandler(event)"
click="zoomOutButton_clickHandler(event)" />
<mx:Image id="zoomInButton" source="{CMSData.rootURL +
'assets/images/zoomin.png'}" buttonMode="{zoomInButton.enabled}"
mouseDown="zoomInButton_mouseDownHandler(event)"
mouseUp="zoomInButton_mouseUpHandler(event)"
click="zoomInButton_clickHandler(event)" />
</s:HGroup>