Merge "Reset window title back to activity title when selection finishes." into oc-dev