Merge "Add order to display settings" into 24D1-dev