Merge "Move keys removal to background handler." into tm-dev