Merge "Disable Image Visual Pixel alignment when using Layer3D" into devel/master