Merge proposals dependent on lp://staging/~stolowski/unity-scopes-api/fix-expandable-widget-doc

1. fix-expandable-widget-doc
2. Dependent merge proposals