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