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

Change-Id: I6b1083880346194934be435d31ce4e66f5d34528