Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev