Merge "Reset leash and content overlay if auto-enter-pip is aborted" into sc-dev