Merge "Fix PSS/USS Average in procstats"