Merge "camera 2.4: conditionally disable memory init"