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