Merge "DeviceProfile refactoring for connected displays" into main