Merge "Fixes searchability for timeout settings page." into main