Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev am: 4b15467f5f
am: 2f8f814501

Change-Id: If3d72a9866f1aff44326db653e4f1fd670275366