Restore selection after closing save dialog

Also simplify some weird focus code in MWSaveDialog

Bug: 72911
Change-Id: Ifb8fd9be96a199f86412247211e3920a35dd22bf
Merge "Restore selection after closing save dialog"