Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev