Merge "Finish activity if uninstall is done" into oc-mr1-dev