Merge "Align locale with activity that start the task"