Merge changes from master into upgrade-nav-drawer