Merge "prevent concurrency issues during LocationManager init"