Merge "STL avoid multiple onStop calls" into main