Merge "Update searchMessages API"