Merge "Delay clearing digits until onStop()"