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

* commit 'ceca4ff1891baf033cd9d6951ec5a1d31473642f':
  Support for 600dp & custom clings