Merge "Support DisplayShape"