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

Change-Id: Icd80b77ff7e7b7d6cadecb914609e90fab2b9a8e