* Video view activity
* Merged with the master