Merge "Updated DisplayHash APIs" into sc-dev