Merge "Leanback: fix testSetSelectedPositionDetached"