Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev