Merge "Supporting independent back nav while task embedded" into sc-v2-dev