Merge "Merge "Disabled items shouldn't also be marked as unactionable." into qt-dev am: 0963cc24 am: 41f03264" into qt-r1-dev-plus-aosp