Merge "Support for 600dp & custom clings" into jb-dev