Merge "Various API council fixes to drawables"