Merge "Device always wakes up when the bouncer shows" into tm-qpr-dev