Merge "Fixes Search bar padding when work profile not present." into tm-dev