Merge "Add a config flag to control app transitions"