Merge "Check on Picture Dimensions" into mnc-dev
am: 9d981e9dec

Change-Id: I44ff65a61bdfbb482f181e76e1ae6a6298c97c18