Merge "Preventing widgets from exceeding Bitmap memory limit" into nyc-mr2-dev am: bde1091f50
am: 3678020883

Change-Id: Ic870d1a75c3f15b86d5a1f7487ffb0dad5f5ec77