Merge "Reduce the memory usage in system_server" into sc-dev