am fa5643ec: am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev

* commit 'fa5643ec4f0c51d09fbf4278351d3147d7f6cd15':
  Prioritize reveal clipping over Outline clipping