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

Change-Id: I26cb2439a2d0c5f50175ddfa1e0b20d79493fa08