Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev