Merge "Fix SmartForwardingActivity crash at screen rotation" into main