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: af9218f1 am: 43cba792 am: 85c718a9
Change-Id: If5053946ada62129724ac231321364d3c7b4dac9