am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev

* commit '3a77663bd6a4dd3f06552ed49db03e8c09181ca2':
  Fix path for handling system window with app token.