Merge "Extend stack management to other displays." into klp-modular-dev