Merge "pin-shortcut: Tracks hotseat states and adds unpin option for taskbar" into main