Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev