Merge "fix uid for ActivityForegroundStateChanged atom"