Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev