Fix merge fail in ViewController.mm - should use new const rather than old #define.