Merge "Revert "Hide scrollbar if not enough space"" into rvc-qpr-dev