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

Change-Id: I72bdb074c5e0b2c7ff93fa53f0e8242382df1c37