Merge "Add minimum size check for ImageGrid atom" into oc-mr1-dev