Merge "Do not wrap activity surface if it is handled by rotator" into main