Merge "Reverting change in accessibility focus behavior"