Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev