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

Change-Id: I990a85b223694123bbf9114e038373253fd4f25f