Merge "Ensure DrawerLayout does not receive accessibility focus" into lmp-mr1-dev