Merge "Disable crashing drop shadow tests" into oc-dev