Merge "Don't crash when passing null to requestChildFocus" into oc-dev