Merge "Camera: fix triggerId logic" into lmp-dev