Merge "Resolve intent before launching from DashboardFragment." into oc-dev