Merge "Add Foreground Service Timer"