Merge "Do a null check on setting an AP as configured"