Merge "Add overlayfinishing state." into tm-qpr-dev