Merge "Removing 'override' from nav bar mode APIs." into tm-dev