Merge "Nit cleanup: Update TileLayout.onLayout" into pi-dev