Merge "Camera: Limit the scope 'mTrackerLock' within 'disconnectImpl'"