Merge "Add wifi direct settings UI"