Merge "Add flag to force public virtual display to show own content." into klp-modular-dev