Merge "Revert^2 "Support search "Mobile data""" into main