Mostly incorporates the 'only set active keyboard if old one was removed'...

Mostly incorporates the 'only set active keyboard if old one was removed' request, though there's an occasional issue with the active keyboard mysteriously persisting.