am 596ba2fa: Merge "Correctly invalidate views that transition from opaque to non-opaque. Bug #3337037" into honeycomb

* commit '596ba2fa791db7ae671bd79c346b54a7ea2f8113':
  Correctly invalidate views that transition from opaque to non-opaque. Bug #3337037