Merge "Sniro Emulator - Fix SO CallBack with Resource IDs"