Merge "Add the theme for the bottom sheet UI" into main