Merge "Fix cellinfo stop to refresh" into sc-dev