Merge "Revert "Make the isQuickScaleEnabled method"" into klp-dev