Merge "Revert "Marshal dream overlay connection logic with Handler."" into tm-qpr-dev