Bug 838169. Fix NrIceCtx cleanup. r=abr
Bug 840633 - style fix. r=smaug.