Merge "Fix panel handles on large screens." into jb-mr1-dev