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