Merge "Add a DisplayLayout utility"