Merge "Fix navigation buttons focus state" into main