Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev