Merge "Update accessibility icons for S and using adaptive background" into sc-dev