Merge "Various API review fixes to resources and drawables"