Merge "Fix non-ime apps use keyboard category" into main