Merge "Fix drag layer" into jb-dev