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