Merge "Fixed system recovery failure when only Soft Ap is enabled." into tm-dev