Merge "Enable dock setup recovery flag" into tm-qpr-dev