Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit