Merge "Disabled items shouldn't also be marked as unactionable." into qt-dev am: 0963cc2418 am: f695023309
am: 315cd7d00f

Change-Id: Ia47380572b48df0d43f923791c1750b59cc3cb3c