Merge "Unselect track to not affect next selected track" into kitkat-cts-dev