Merge "Remove frame and shadow from CircleFramedDrawable"