Fixes to note image capture for device testing