Merge "Update button touch area in search history view" into qt-dev