Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev