feat: cherrypick of faulty keys repair (WPB-22180) #1742

Job	Run time
build-validation / style	2m 59s
build-validation / lint	12m 47s
build-validation / UI Tests / ui-tests (29)	13m 32s
build-validation / Unit Tests / coverage	10m 53s
build-validation / Build Dev-Debug	19m 40s
build-validation / deploy (Dev, Debug, debug, apk, false, s3) / deploy (s3)	17s
build-validation / deploy (Dev, Debug, debug, apk, false, s3) / deployment-summary	3s
	1h 0m 11s

Provide feedback