Merge "Revert "PIP: Temporarily disable overlay text bubble timeout"" into nyc-dev