Merge "Fix snackbar position"