Merge "Remove silky flag from Display for official release" into sc-dev