Merge "Move onDrawn callback earlier" into tm-dev