Merge "Remove client drawn shadow code" into main