Merge "amlvideosink: CF2 add version control [1/1]" into dev