Merge "Allow the default mode for video peek to be undefined" into tm-dev