Merge "Snackbar fixes" into lmp-mr1-ub-dev