Merge "Keymaster worker threads stick around for 30s"