Merge "Add tracepoints for potential performance issues" into qt-dev am: 28cb4d23db
am: cb12c60411

Change-Id: I0f0ff21e7e3b5e8306d41d65d0f2cf12e501499c