Merge "Revert "Proper refresh when Authentication finishes with Activity.RESULT_OK."" into oc-dev