- Fix bottom sheet / popup related issues