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

Change-Id: Ia851bbedb5fc429ea05eb0b1eaa5cbcddec7b961