Merge "Cap widget bitmap usage by screen size (issue 6464700)" into jb-dev