Merge "Improve DreamOverlayService thread safety." into tm-qpr-dev