Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev