Merge "Made bp have higher window priority" into udc-dev