Merge "Wifi Settings: Add auto option for softap"