Merge "SF: don't skip draw for clearContent" into sc-dev