am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev

* commit '20f71891c4ae420398b96cc6a77f0c43316e6717':
  Fix Fade out during Activity Transition.