Merge "Show taskbar when external keyboard is attached, in 3 button nav mode and desktop windowing mode" into main