Merge "Work on issue #5465917: Wakelock *overflow* held for very long times" into ics-mr0