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