Merge "Fix a crash when transferring an app."