Merge "Prevent crash in app memory updater." into mnc-dev