Merge "Fix crash in not installed for this user apps" into nyc-dev