Merge "Check if the display is organized only for the trusted displays." into sc-v2-dev