Merge "Fix CS wakelock handling" into ics-mr1