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

Change-Id: I114a71c51b51c5fd3b0e6772931723358084027a