Merge "Change padding around close in search view" into rvc-dev