Merge "Camera: Use original client PID for eviction" into nyc-dev