Merge "Remove unused drawables and associated data/code"