Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev