Merge "Fixing issue with floating task headers."