Merge "Listen to display focus state in Launcher" into main