Merge "Fix for crash in third-party app"