Merge "init: manually set controlling tty for console services"