Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev