Merge remote-tracking branch 'segfault/feature/15784-always-show-scrollbar' into feature/14594-asp-gui