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