(bug 45016) make sure dismiss works across all supported types

Change-Id: Id9bf0c785a8fe429c6ec04c427330395d30bf68c
Merge "(bug 45016) make sure dismiss works across all supported types"