Merge "Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev am: 65a3b2cc am: 3bf4b6f1"