Merge "Workaround apps that override surfaceCreated" into oc-dev