Merge "Enable GLANCE_ENFORCE_SCOPE to True by default"