Merge "Code cleaning for Drawables" into klp-dev