Merge "API: Finish killing "raw mode""