Revert "Revert "Fix FC on third party keyboard setup""

This reverts commit e495df1e895dc14b72065cee39c9630ef4745462.