Merge "Do not wake the device if an activity starts while dozing." into tm-dev