Merge "Keep layout from overwriting translate dimensions" into jb-dev