Merge "Make the isQuickScaleEnabled method" into klp-dev