Merge "Revert "Tag detection does not stop after screen off""