Merge "Fix SeekBarPreference selectable test" into tm-dev