Merge "Fixed call to setServiceForegroundInnerLocked()."