Merge "Handle config changes in the trampoline activity" into main