Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev am: c589f1b1f7
am: 2f8f884ecf

Change-Id: I69b65f1f48069891217a9b164eeeaea495a957d8