Merge "Handle width and height options in Tile previews" into sc-dev