Merge "Updated how taskbar touch area is being set." into main