Merge "navigationbar - fixed clock separator hiding problem"