Merge "Fix touchable region calculation in NavigationBarController" into tm-dev