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

* commit 'cccd6c67db8c610bcaa469e0e1b808eb98807453':
  Avoid trying to draw invisible ShapeDrawables