Merge "Fix using screen content tuning in all the cpu speed tests."