Merge "Prevents recursively moving activity to a new expanded container" into main