Merge "Fallback to priority activity if preferred activity not available." into mnc-dev