Merge "Don't clear cache when changing accessibility focus"