Merge "Revert "Use configStore for maxVirtualDisplay Size""