Merge "Set taskbar heights to 0 when taskbar is not present." into main