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