Merge "Make Glance standalone-ness a separate flag"