Merge "Drop multi-window mode requests in locked task mode" into udc-dev