Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev