Merge "Fix Snackbar + FloatingActionButton showing simultaneously" into mnc-ub-dev