Merge "Made bp have higher window priority" into tm-qpr-dev