Merge "Remove Taskbar Pinning menu when in three button navigation mode" into main