Merge "Fix NPE in ActivityThread" into oc-mr1-dev