Restore selection after dialog close

Change-Id: I534e38633700191782a7b088de0ae46a5f800fa8
Merge "Restore selection after dialog close"