Merge "Only use padding for the multi-user empty state screens." into rvc-dev