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 am: 48941d19
Change-Id: Icb1b05ee601b327c4e5be7d9f1e5358a5d034783