Merge "Stop tracking user specific uid cpu time on user stop"