Merge "Fixing issue related to printing out of display state and idle mode in the batterystats checkin."