Merge "Updates comment for SOFT_AP_TIMEOUT_ENABLED"