Merge "scuba: Tune perf xml based on measured fps"