Update the hearts view to latest zsdx fixes.
Merge branch 'v1.7'