Merge "Make runOnMainAndDrawSync safer"