Merge "Move updating stack override config to ActivityStack"