Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev