Merge "Accounting for widget padding in dips instead of pixels" into jb-dev