Merge "Align main thread checking by calling ThreadUtils"