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