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

Change-Id: I58592f26c485d05b73191464f899d8a3bb3b8961