Merge "Delete ShadowActivityManager" into main