Merge changes I882726aa,Id2987dce into main

* changes:
  Allow gesture blocking by activity type.
  Send preview state to DreamOverlayService.