Merge "Ensure airplane mode take effect by checking softap status"