Merge "Clear invisible undrawn activities when reporting drawn" into sc-v2-dev