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

Change-Id: I4e3504f9475f3795e2a8c88e45df78b862e6ba25