WIP: [[nomerge]] adapt to location changes happening outside of Angular

Just opening for Travis for now. Still need to determine if this is best approach to problem described in #6976.