Merge "Fix threading problems with drawables" into nyc-dev