Merge "Fix NPE in ActivityManagerService" into klp-dev