Merge "Fix window token leak on multi-display targets" into android14-gsi