Merge "Reuse and reparent one-level root task to another display" into rvc-dev