Merge "Ignore test case of SetupSkipDialogTest" into tm-dev