Merge "Add display shape config"