Merge "Fixes to adaptive denoiser mode."