Merge "Remove redundant vvm3_enabled bool"