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

Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b