Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev