Merge remote-tracking branch 'origin/newframework' into clips
Fixes per code review
Merge bp323/clips and fix conflicts
Added opacity to play video icon
Merge remote-tracking branch 'origin/newframework' into meClip