Merge "Fix SetupSkipDialogTest" into tm-dev