Merge "Fix bug 3167945 - list selection mode should persist across rotations"