Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev