Merge "Discard surfaceDamage for HWC1 v < 1.5"