Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev