Merge "Skip duplicate USER_SYSTEM start in SystemServiceManager." into tm-qpr-dev