Merge "Prevent NPE in startActivityUnchecked" into oc-dev