Merge "Restore STA reconnection behavior"