Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
am: 4786291624

Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e