Merge "Try not to crash while AppInfo is finishing" into mnc-dev