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

Change-Id: Ie13a443ff5b4b63ac2576209322722ce731cd0e8