Merge "Add config for Wi-Fi Hotspot Settings hidden"