Merge "Correct signal for showing contextual buttons for taskbar" into main