Merge "Reset the layer of the nav bar when restoring it back" into sc-dev