Merge changes from topic "am-5b50c796-9c7d-4769-bc6c-f71bdac7c742" into cw-f-dev

* changes:
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46 am: 7c6da2165b
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46
  [automerger] Add bounds check for tile dimensions am: 05f83e9458
  Add bounds check for tile dimensions