Merge "Introduce new wake lock level for screen timeout" into main