Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev