Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev