Merge "Fix exception happened in maybeSetUpImageGrid()" into sc-dev