Merge "Defer peek legacy configuration until after startup" into tm-qpr-dev