Merge "Do not reparent task or set windowing mode when layout task" into tm-dev