Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1