Merge "Rename isStrictMode to better names"