Merge "Move 'move effect' logic to dolby private code"