Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev