Merge "Add new dock setup states to state enum" into tm-qpr-dev