Merge "Fix crash during Activity Transition with TextureView." into mnc-dev