Merge "Only use padding for the multi-user empty state screens." into rvc-dev...
Merge "Only use padding for the multi-user empty state screens." into rvc-dev am: 1f659da6 am: b6a29995 am: b32dd3dc
Change-Id: I68039d7786bc8f5322badebcac6ee68aea2c2a35