Merge "Removed ScopedPHPTimeout; unused"