Merge "Reduce screen on delay during UsageStats rollover"