Merge "Remove flicker when dismissing snackbar" into sc-dev