Merge "Fix padding of title on entity header does not wrap properly"