Merge "Fix Fade out during Activity Transition." into mnc-dev