Merge "[WifiSetup] Show MAC address in footer" into mnc-dev