Merge "Return to home when overview command fails." into tm-qpr-dev