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: df5be383
Change-Id: Idc93282f977f508be25c4614309755f39af5823e