[[ Bug 12824 ]] Make sure boundrect computes screen rect correctly.
Merge branch 'bugfix-12824' into develop