Merge "Add back checkThread for invalidate() call" into main