Merge "Some wake-ups can be considered unlock-intents" into tm-qpr-dev