am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into jb-dev

* commit 'e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7':
  Don't set hard width/height for cling OK button.