Merge changes I15da2563,I7845542d into nyc-mr1-dev

* changes:
  Don't reset current thread's priority accidentally.
  add tracepoint for when the display chain is stuffed