Revert "Revert "Add active display to RS""

This reverts commit 635bd8c22796b95e18b4cefeaaaffd505b45dbda.