Merge "Update Wakelocks to be per-DisplayGroup" into sc-dev