Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b am: eae7928b34
am: 2faaec939a
* commit '2faaec939ae1039ae17cac6304f64f6f7f893dfd':
Change-Id: I689a97fcfa53e59be34906ccc91308ad238ac06e
This commit is contained in: