Merge "Call onDrawn on main thread to delay the callback" into tm-qpr-dev