Merge "Attempt to redraw the active commandline when needed"