Merge "Use correct title when opening from notification" into oc-dev