Merge "Add flag that disables depth on overlay scroll" into tm-dev