Merge "Reorienting wakelockController to have generic exposed functions"