Merge "fix NPE when fragment container is null" into oc-dev