Merge "Add logging for cinematic effect" into tm-dev