Merge "Adds timeout mechanism for soft AP when no clients"