Merge "console: add a flag to prepend '\r' in the multi-console framework" into integ...