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

Change-Id: I576f611e4a1a6567e7cd2e80b4f5575ba99e2f4d