Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev