Merge "Annotate Snackbar correctly" into lmp-mr1-ub-dev