Merge "Add ability to disable wakelocks in light idle." into main