Merge "Update signal strength on ServiceState in service"