am 966182f2: Merge "Fix drag layer" into jb-dev

* commit '966182f222da8da1fed2ce1f3945fae3d3d488d0':
  Fix drag layer