Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-dev