Merge "Properly crop header underneath panel close handle." into jb-dev