Merge "Camera2Basic, Camera2Video: Bug fixes" into lmp-dev