Merge "Hotspot 2.0 UI." into mnc-dev