Merge "Fix ActivityThreadTest#testDoubleRelaunch" into main