Merge "Fix for accessibility focus in custom snackbar" into main