Merge "sw600dp clings" into jb-dev