Merge "Fix null pointer exception when checking whether to hide VVM settings." into oc-dev