Merge "Remove GLANCE_V1_ENABLED option"