Merge "Revert "Update the ambient indication container"" into sc-v2-dev