Merge "Update 600dp clings." into jb-dev