Merge "Don't make translucent window opaque during activity transition."