Merge "Don't account for floating window region in nav bar touchable region" into sc-dev