Merge "Camera2: modified video snapshot test" into lmp-dev