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

Change-Id: Ia7bf7d2ed57224ea6641e14be5b5a4737ebee776