Merge "ctrl_iface: Retain legacy ctrl interface directory" into main