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: 6f94d1b1
Change-Id: I4a15b529410f6da80def6592615955aa512845b5