Merge "Handle non-activity trampolines from widgets" into main