Merge "Fix fade transition not working with Activity Transitions." into lmp-dev