Merge "Revert "Test: unfold_to_widgets"" into udc-qpr-dev