Merge "Add flag_navigation_bar_overlay" into sc-dev