Merge "Treat changes in device-state as user-activity."