Merge "Fixes NavigationBarFragment leak"