Merge "Fix CTL scrim not working with activity transitions"