Merge "Avoid calling into phone process with NPMS locks held." into sc-dev