Merge "Sdksetup: Set path for display settings file for freeform display" into sc-dev