Merge "Made wfThumbIsStandard() aware of the width/height handler scaling choice"