Merge "Stops the repeatedly activity launching app more aggressively" into main