Merge "Do not reset duplication check after APM/poweroff for TMO" into mainline-prod