Merge branch 'wjc'

JLChen

2021-03-04 ac3c6b64df51443519d3a27fa8cf0d25dd6ff6d7

 Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs

@@ -465,9 +465,9 @@
                    //}
                    Application.RunOnMainThread (() => {
                        if (IsDeviceList) {
                            var userDeviceListPage = new AlexaSettingPage (tempRoom);
                            var userDeviceListPage = new AlexaSettingDevicePage (targetInfoList);
                            userDeviceListPage.Show ();
                            userDeviceListPage.ShowPage (null,null);
                            userDeviceListPage.ShowPage (saveAction);
                        } else {
                            var mAlexaSettingScenePage = new AlexaSettingScenePage (targetInfoList);
                            mAlexaSettingScenePage.Show ();