Merge "Setup button bar padding before empty state handling" into rvc-dev