Merge "Fix ordering of notifying dismiss callback" into oc-dev