Merge "Prevent potential NPE of checking task drawn for logger" into sc-dev