Merge "Do not wake up all displays" into tm-dev