Merge "conman: Delete persisted options when stopping an AP or client." into wifitv