- [matrix] popup-breaking fixes.