Merge "Fix default keymaster so it doesn't start an extra thread." into pi-dev