Merge proposals dependent on lp://staging/~jeremywootten/screenshot-tool/fix-1438250-include-child-windows

1. fix-1438250-include-child-windows
2. Dependent merge proposals