Merge "Fix soft Ap handling on system restart" into honeycomb