Merge "Fix no correct window observer of an embedded display"