New branch of primitive_media from cs 111890, prior to ballista ammo rework Cherrypicks all subsequent changes ont he branch, but not any merges from primitive Cherry picks 111915, 111916, 111917, 111919, 111962, 112033