Merge "Added a screen to configure wireless scanning"