Revert "Merge pull request #16703 from ian-liu/bubble_tea/system/bug964653_system_dialog_refactor"

This reverts commit c9a08d42366ce7ab8921db8c2f713e7616003c97, reversing
changes made to 8203f68527dfc3054b9f10f5ae1b1a609ba2f087.