Merge "Ensure Wakelock display group is still valid." into sc-dev