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