While I agree that the whole display setting stuff needs rework and would be willing to help out in any way, the problem with the prompt showing up unexpectedly exists in the current code and needs to be fixed and we can't rely on anything that will be merged someday in the future. If there is a better solution that is more generic and would be easily adaptable for any future changes I'm all ears.