Merge "Dismiss all system dialog before testing" into sc-dev