Merge "Fix a transition issue when starting an activity with CLEAR_TOP flag" into main