Merge "Use configStore for maxVirtualDisplay Size"