Merge "Merge "Unselect track to not affect next selected track" into nougat-cts-dev am: 5792aa3ee3" into nougat-mr1-cts-dev