Merge "Fix 0x10000 resource not found exception"