Merge "Move LocationManagerService to background thread"