Merge "Reduce margin size below empty state header" into rvc-dev am: 6148bb8547

Change-Id: I7784a741dccbad260637c7aecfe37c93b9f02903