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