Merge "Clean up changing AP configuration"