Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev