Merge "Remove surface damage from planner LayerState" into sc-dev