Merge pull request #22743 from mcav/net-end

Bug 1048487 - [email/backend] node-net.js's end() method does not actual...
Merge pull request #22816 from dmarcos/bug1051200

Bug 1051200 - Camera brightness blocked after touch-focusing on dark zon...