Merge "Fix Companion UI crash on configuration change" into oc-dev
am: c1e3ab359f

Change-Id: Ia856f6b9c5db4f5b061930469650321bc1452497