Merge "Check on Picture Dimensions" into mnc-dev am: 9d981e9d am: 022233d7 am: 4975f068 am: d7619413 am: 9229109a am: 7de48348 am: 30652f29 am: d4f491bf am: 90024d52 am: 13f5db7e am: 25845517 Change-Id: I43bb328da47e5184308f2dbe0311eaa579d949f8