Fix non-retained global static
Fix modal presentation context demo