Merge "Retain current position and expand state on `next video`" into rvc-dev...
Merge "Retain current position and expand state on `next video`" into rvc-dev am: 7d4bad92 am: b7a1bd55 am: 2281ade6 am: 000b57ef
Change-Id: I630cadcfd5dec6d5dc65d72e7be558513095895b