Merge "Workaround for doze/AOD problem with global wakefulness" into tm-qpr-dev