Merge "Hook up wake-lock-screen with plugin structure"