Merge "[elc_navigationbar]: prevent defect fix 20519, removed unnecessary test as...