Merge "Remove unneeded margin/padding to fix scrolling." into rvc-dev