Merge "Merge "Allow the default mode for video peek to be undefined" into tm-dev am: a4b0d8af28 am: 74b6e2827c" into tm-d1-dev-plus-aosp