Merge "RV should have a standard scrollbar when the PRV scroll bar is not enabled." into pi-car-dev