Merge "Restrict VVM number settings to portrait"