Follow-up for Bug 1036825 fixing 2 issues. r=aeftimie, r=amatei, r=hskupin

--HG--
branch : mozilla-aurora
extra : transplant_source : %D5%94%C0%09%11%DB%941Ws%97%D4%ED%DD%B1.Fx%F0%83