Merge "Reset the flag of attaching nav to app to prevent flickering" into sc-dev