Merge "Add Configuration data for round displays" into mnc-dev