Incremental commit: font/layout popover remember position