Merge "Allow Activities to handle configuration changes" into main