Merge "Clear accessibility focus when hierarchy is removed"