Merge "Wrap Activity->Activity changes in non-activity transitions" into main