Merge "Physical keyboard related options shouldn't be searchable when invisible" into main