Merge "Revert "Move LocationManagerService to background thread""