Merge "Use Button for Snackbar's action" into lmp-mr1-ub-dev