Merge "Fix system crash when unpair app" into sc-dev