Merge "Fixes to interstitial activity transitions" into main