Fixes for lingering focus state on single and multi choice items.