Merge "Add postAndWait() trace for calculating frame drawing time" into tm-dev