Merge "Overlay, actor, and target app visibility handling"