Merge "Avoid reentrance on ClipArea APIs" into nyc-dev
am: 5ce4e2e

* commit '5ce4e2e78f3f4e1c39423a79ad1787e05b961e14':
  Avoid reentrance on ClipArea APIs

Change-Id: Iac7810d1732fa2435436c324490bcc313f31c475