Merge "Fix Snackbar dismisal generating two callbacks" into mnc-ub-dev