Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev