Merge "[WifiSetup] Tablet portrait layout" into lmp-dev