Merge "Ensuring that headsups go away when unpinning via active edge" into pi-dev am: 6ece0f3f62
am: bc64c0d565

Change-Id: I668bf4f0978d505fa419852a1d87733893771b30