Merge "Fix creating new activity instance when launching alias activity"