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

Change-Id: I0e77a746106a975bf75cf7e3a932e5925ae9d30b