Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev