Merge "Fix padding problem between search bar and homepage cards"