Merge "Remove unnecessary thread suspension"