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

Change-Id: I033327cd9ff7c24aa6f6eeba07cd96af15227ae4