Merge pull request #15367 from changm/bug950250

Bug 950250 Make background scroll with content r=arthurcc