Merge "Display: Handle S3D format set/get correctly"