Merge updates into upgrade-nav-drawer