Merge "API tidy up for Snackbar" into lmp-mr1-ub-dev