Merge "Merge "Fix accessibility order in nav bar" into nyc-dev am: 4691e24d0b am: 3857c06ebc" into nyc-mr1-dev-plus-aosp