Merge "Partial fix for blank widget page" into jb-mr1-dev