Merge "Add running services screen to developer options"