Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev