Merge "Camera2: make recording test more robust" into lmp-dev