Merge "Simplify dock setup state setting" into tm-qpr-dev