Merge "bug fix possible NPE while startProcessLocked()"