Merge "StrictMode "custom" trigger support."