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
Change-Id: Ia9211719877ef16bfdf5fd3e78d5e273d3d8ee31