Merge "Fix layout bounds spelling." into jb-dev