Merge "Add bottom offset to empty state screens for chooser" into rvc-dev