Correct split view and keyboard navigation

Rework of pervious commit that actually works
63ef8872bfc485248a8de6c7b45909afc68bfcc9

Thanks to Nikolay Zlatev <nik@astrapaging.com>

BUG: 411387
(cherry picked from commit b27c8e7fd3b047cf4893c7eb202c4861bccc21e8)