Always set selected to the dead header. Use stable IDs

Fix b/6825717

Change-Id: Ib392238d142c18e4d91984167562600e14a42949
2 files changed