Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev