Preserve scroll position after dialog close

Bug: 49977
Change-Id: I8cc12ba7845eebc6199fbcd2d355bf0d5f38264b
Merge "Preserve scroll position after dialog close"