Merge "Fixed a UI issue with Cellular networks" into lmp-mr1-dev