Merge "Add unit test for AppLocalePickerActivity" into tm-dev