Merge "Fix cts failure of DisplayShape"