Merge "Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value." into tm-qpr-dev