Merge changes I73e2e004,I21143ed3

* changes:
  Revert "Overlay, actor, and target app visibility handling"
  Revert "Fix WmTests presubmit failure"