Merge "Inline (fully enable) Wakelocks in NMS" into main