Merge "composer: Fix handling of SetClientTarget for built-in displays"