Merge "Reset draw state after notifying invisible to activity window" into main