Merge "[rdkb][common][app][Fix wifi reload failed when ap is down]"