Merge "Add 2mm dead zone (12dp) at the top of the navigation bar."