Merge "Ensure public methods are running on handler thread"