Merge "Make taskbar visibilty change only in desktop." into main