Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev