Merge "navigationbar: [Test cases crash issue fixed in test cases]"