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

Change-Id: I1228208bf54897ed967956d227a40c1cb046c63f