Merge "Add bottom padding to empty state screens." into rvc-dev