Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b
am: eae7928b34

* commit 'eae7928b34af07f45bf585d2f789db9abc3e38f9':

Change-Id: I7626d2f101935f7c06e3b74aa6b7dd33665db0be