Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev