Merge "Remove token behind fullscreen activity from unknown visibility"