Merge "Don't trigger DisplayAreaOrganizer events for untrusted display" into sc-dev