A couple adjustments to the dismiss to prevent flickering on Drop style when dismiss is called too soon
A better attempt at fixing the issues with animations and queued dismiss