Merge "Enable scissor for rounded outline clips" into lmp-dev