Merge "Add minimum size check for ImageGrid atom" into oc-mr1-dev
am: 215185d3cd

Change-Id: Ib67681af2ecda9aeb8f54609779316eac0abfd99