Merge "Fix touchable region calculation in NavigationBarController (2nd)" into tm-dev