Merge "Update reset logic for time limited foreground services." into main