Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev