Merge "Experiment to be able to change the navigation bar thickness (1/2)"